Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2025

What does this PR do?

This commit adds the skip-changelog GitHub label for PRs created by automation for Bump VM image PRs.

Why is it important?

Without it, the mandatory fragment-in-pr check is failing thus preventing automerge.
Example where we had to manually add the label: #8618 (comment)

Related issues

#8359


This is an automatic backport of pull request #8627 done by [Mergify](https://mergify.com).

This commit adds the `skip-changelog` GitHub label for PRs created by
automation for Bump VM image PRs. Without it, the mandatory
[fragment-in-pr](https://github.com/elastic/elastic-agent/blob/main/.github/workflows/fragment-in-pr.yml)
check is failing thus preventing automerge.

(cherry picked from commit 7a579fa)

# Conflicts:
#	.ci/updatecli/updatecli-bump-vm-images.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 23, 2025
@mergify mergify bot requested a review from a team as a code owner June 23, 2025 11:40
@mergify
Copy link
Contributor Author

mergify bot commented Jun 23, 2025

Cherry-pick of 7a579fa has failed:

On branch mergify/bp/8.17/pr-8627
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 7a579fab8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/updatecli/updatecli-bump-vm-images.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@dliappis dliappis removed the conflicts There is a conflict in the backported pull request label Jun 23, 2025
@dliappis dliappis enabled auto-merge (squash) June 23, 2025 11:52
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, a small conflict got resolved we are now just adding the right label skip-changelog

@dliappis dliappis disabled auto-merge June 23, 2025 12:15
@dliappis dliappis merged commit 0cff839 into 8.17 Jun 23, 2025
9 checks passed
@dliappis dliappis deleted the mergify/bp/8.17/pr-8627 branch June 23, 2025 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants